Set git branch back to debian/master
authorSimon McVittie <smcv@debian.org>
Thu, 21 Jun 2018 21:50:50 +0000 (22:50 +0100)
committerSimon McVittie <smcv@debian.org>
Thu, 21 Jun 2018 21:51:10 +0000 (22:51 +0100)
debian/changelog
debian/control
debian/gbp.conf

index c4955434af9420efcfc67e80a4ccd571dec13cdf..07f8dd518147e5c06e0d567b24ab778f10aa7c4a 100644 (file)
@@ -1,6 +1,5 @@
 ostree (2018.5+42+gecdebeb2-1) UNRELEASED; urgency=medium
 
-  * Switch to experimental branch
   * New upstream git snapshot with support for peer-to-peer software
     collections, required by Flatpak's peer-to-peer app sharing feature
     - d/copyright: Update
index a71776e8dbcd8ea4b40f51448058b50990f95d76..f89fc6d7df968b2a0e243b20a181afccc85fc4e0 100644 (file)
@@ -48,7 +48,7 @@ Build-Depends-Indep:
 Rules-Requires-Root: no
 Standards-Version: 4.1.4
 Homepage: https://github.com/ostreedev/ostree/
-Vcs-Git: https://salsa.debian.org/debian/ostree.git -b debian/experimental
+Vcs-Git: https://salsa.debian.org/debian/ostree.git
 Vcs-Browser: https://salsa.debian.org/debian/ostree
 
 Package: gir1.2-ostree-1.0
index eda2cdd29205bcb9b31f04cdb4cf72170ce5a892..2bda9c8b6ce83248eccd88c38c71fffb4f3df66b 100644 (file)
@@ -1,7 +1,7 @@
 [DEFAULT]
 pristine-tar = True
 compression = xz
-debian-branch = debian/experimental
+debian-branch = debian/master
 upstream-branch = upstream/latest
 patch-numbers = False
 upstream-vcs-tag = v%(version)s